mimeapps: gedit for patch files
Merge remote-tracking branch 'upstream/master'