Merge branch 'master' into PrettyLinesDev2
Merge branch 'master' into PrettyLinesDev2

file:b/toolbarIcon.xcf (new)
 Binary files /dev/null and b/toolbarIcon.xcf differ