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