Fixed save inconsistency issue
Merge in changes to common types from branch 'maptools'
Merge branch 'maptools'
Merge remote-tracking branch 'origin' into maptools
Fixed problems with the property table and map view