More robust marker editing of markers for newly created claims
Merge remote-tracking branch 'origin/master'