Merge pull request #653 from ryscher/dryad-staging

Fixes for atmire 2190