merge dryad-master into dryad-dev

Previous update of dryad-dev (merge dryad-master into) was incomplete.