Get View->Props and Vert Scale dialog to work together [1408]
Merge remote-tracking branch 'upstream/master' into inq1720_metadata