Fixed crashes when editing the map of a newly created claim
Merge remote-tracking branch 'origin/master'