Merge branch 'rj/mingw-compat-st-mode-bits' into next