Fix maps script
Merge branch 'master' into uncodin