Placeholder pull request for merging "joe" branch

This PR is being opened for merging modifications made by Joe into master.