Synchronize dev

Merge master into dev to try and go forward from here. Bad Steve. Should not be pushing to master. Steve is sorry, master.