Dryad staging

Update staging to include recent commits from dryad-master.