desktop file
Merge branch 'v2.1.7' into testing