Change-Id: I7a0713e3357fc421fcaa6771c9440f2b2f5f58f6 Tested: with VS2010
Change-Id: Ife9775fdedc9e084c1e826ef13dff06a1b1b2ec2 Tested: on Windows and OS X.