Merge branch 'dev'
Fixing build problems!
Merge branch 'master' into dev