Map fun.
Merge branch 'master' into pietrko
Preparing the map-fixes for new path.
Fixes
Fixed static modifiers.