map fix
map fix
Merge branch 'master' into stable