Map changes for #1292
Merge pull request #1300 from EPuncker/master

Map changes for #1292