Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Thu, 10 Jan 2019 17:03:51 +0000 (12:03 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Thu, 10 Jan 2019 17:03:51 +0000 (12:03 -0500)
commit45dc3f7768dee4fc787dd26a5f9ee5ba07553933
treef1ff64b3d0190031caa0bf6bae090e2725915ca5
parentaf824dae39ec6a6dd990473f0288677745d78a5a
parentfb827907691cddfd7b332bbc98f36262d0cb8fea
Merge branch 'master' into fsf-master

Pulling in upstream changes
launcher