Merge branch '2.2-windows-dist-fix' of https://github.com/doswell/playframework into 2.2-windows-dist-fix
Merge branch '2.2-windows-dist-fix' of https://github.com/doswell/playframework into 2.2-windows-dist-fix