Merge branch 'master' into live
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 19 Jan 2018 23:36:41 +0000 (18:36 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 19 Jan 2018 23:36:41 +0000 (18:36 -0500)

Trivial merge