Merge recent updates from dryad-master.