Merge branch 'map-markers'