modules: once more.
Merge branch 'master' into compatibility