Merge branch 'master' into dev

Updating dev with latest changes to master