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