Merge branch 'dryad-dev' into dryad-master
Merge branch 'dryad-dev' of github.com:datadryad/dryad-repo into dryad-dev