Merge branch 'darcs' into master