Merge branch 'win32'
Andrew Rodland [Mon, 27 Feb 2017 17:46:11 +0000 (12:46 -0500)]

Trivial merge