Hotfix for MSVC compilation.
Merge branch 'master' into PieceGenerator