Rebase datadryad:dryad-dev onto dryad-master

This pull request rebases datadryad:dryad-dev onto the current dryad-master, for ease of merging.