Merge remote-tracking branch 'upstream/master'
Use length limit for dynamic ribbon labels in the GP editor
Merge remote-tracking branch 'upstream/master'
Merge pull request #1621 from marcoll/master

Use length limit for dynamic ribbon labels in the GP editor