Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 10 Jan 2018 15:35:39 +0000 (10:35 -0500)
committerMolly de Blanc <molly@fsf.org>
Wed, 10 Jan 2018 15:35:39 +0000 (10:35 -0500)
commit803f0c172f0e246992b8d38f6be48b0cd16136d1
treef228715788f68fd5581e06c14e0f5e66249b66de
parent2ead6d37b434a8d1e9523f970e5ce0952fd1c461
parentfcb65ea821212d86d903c127a8aa682c48e1b604
Merge branch 'master' into stable