Core/maps: separate mutex for grid
Merge pull request #8906 from ille/GridLock

Core/Maps: separate mutex for grid