Merge recent updates from dryad-master.
Merge pull request #666 from ryscher/dryad-dev

Merge recent updates from dryad-master.