Shorten a string in the menu
Merge remote-tracking branch 'upstream/master'