Merge remote-tracking branch 'origin/master' into frameworks

Authored by ltoscano on Sep 2 2017, 10:57 PM.

Description

Merge remote-tracking branch 'origin/master' into frameworks

Merged Changes

CommitAuthorDetailsCommitted
d80a060950e6ltoscano
Merge remote-tracking branch 'origin/Applications/17.08' 
Sep 2 2017
2919de746415ltoscano
Fix: do not delete the map if Cancel is selected 
Sep 2 2017