Merge branch 'master' into sync-repo-darcs