PHP on Windows does tricky things with inline, which we can't use in mcon.
Merge branch 'fix-win-compile-1.5.6' into v1.5
Merge branch 'v1.5'
BUMP 1.5.7
Back to -dev.
Merge branch 'v1.5'