Merging dev into master.

Initial comments about what the branch was, any sticking points or concerns go here to start the convo.