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