Imported upstream version 6.1.1
Merge tag 'upstream/6.1.1'
Fix icon links and install paths
Use a nicer icon for the desktop entry
Ubuntu PPA-specific changes