Merge branch 'dryad-master' into doi-regex-test3