Adam/merge release

Merged release into this branch (which was based off of master) locally in order to run tests