Merge branch 'dryad-staging' into tmp