Change-Id: I85e8a6bf2fd1ce04271e8afc5083fd47502e5075
Change-Id: I4c9f0f722490b374257adb3fec63e44ae93da920 Tested: using VS2010 / Xcode / gcc on Linux.