Merge branch 'menubar-skip-comments-in-desktop-files' of git://github.com/blueyed...