Merge pull request #1061 from oliverds/master

#1060: Home page maps