Re-introduced draw operation in tool chooser
Merge branch 'gmic-integration' into develop