Fixed a bug with double tapping to finish multi part geometries and hitting done
Merge branch 'master' into dev