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