Re-synchronize dryad-staging with dryad-master

Merging everything from dryad-master back into dryad-staging.