Merge branch 'hotfix/3.6.12' into production
ssl rubygems
ssl rubygems
add legend to map
Merge branch 'hotfix/3.6.13'

Conflicts:
	Gemfile
	config/initializers/version.rb