-w broken (since 2.2) (rev. 2)
Merge branch 'master' into stable