Merge branch 'windowsexe' into next
empar +x
Merge branch 'windowsexe' into next
Merge branch 'next' into stable