Commit fcb322f5a04382e0f0121af5803f0ef0cb42a4af

Edward Thomson 2017-03-31T23:39:33

Merge remote-tracking branch 'origin/pr/3790' into win32_posix