Fix a VC++2013 compile error
Merge remote-tracking branch 'gow/master'
737825af9995748ddfb0c9a9f3475ce6c2675782 rectification