Merging dev into master

Bringing master up-to-speed with dev