Change-Id: Iedac80ee00b27a97c21c7b4ac7c9792e5bafbcc8 Tested: On Windows
Change-Id: I4c9f0f722490b374257adb3fec63e44ae93da920 Tested: using VS2010 / Xcode / gcc on Linux.