Merge branch 'with-dvcs'