Merge remote-tracking branch 'origin/dryad-dev' into dryad-master