Merge branch 'master' into live
authorAndrew Engelbrecht <andrew@fsf.org>
Wed, 2 Jan 2019 22:48:55 +0000 (17:48 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Wed, 2 Jan 2019 22:48:55 +0000 (17:48 -0500)
merge in ruben's commit


Trivial merge