Merge pull request #1003 from sgraham/2015-compile

Fix compile on VS2015