Merge branch 'master' into gsoc-dir-split