Merging work

This is really just a prompt to merge changes from gold, which should tidy up future pull requests.

~ pjf