Merge branch 'hotfix/map_time_nil_bug'
Merge branch 'release/0.9.4'
Merge branch 'release/0.9.5'
Renamed from 'Mapas' to 'Mapa'
Merge branch 'hotfix/rename_map' into develop