Atmire 1763 1 - Recreate work on top of current master

This is work originally in the 1920 pull request redone on a the current dryad-master to assure that it can be easily merged without conflicts.