Merge branch 'master' into with-dvcs