Merge branch 'master' into dev

master branch refuses to merge the actual files from dev.