Merge branch 'master' into develop
Made map.js lint free.