Merge pull request #655 from ryscher/dryad-staging

Re-synchronize dryad-staging with dryad-master