Change-Id: I654217cbd01a3a449503d95753e19b672ec7ec23 Tested: on Windows, Linux
Change-Id: I4c9f0f722490b374257adb3fec63e44ae93da920 Tested: using VS2010 / Xcode / gcc on Linux.