Merge branch 'master' of https://github.com/ircnelson/maps
Merge branch 'v3.1' of https://github.com/ircnelson/maps into v3.1