Change-Id: Ife9775fdedc9e084c1e826ef13dff06a1b1b2ec2 Tested: on Windows and OS X.
Change-Id: I4c9f0f722490b374257adb3fec63e44ae93da920 Tested: using VS2010 / Xcode / gcc on Linux.