Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Thu, 21 Dec 2017 21:43:19 +0000 (16:43 -0500)
committerMolly de Blanc <molly@fsf.org>
Thu, 21 Dec 2017 21:43:19 +0000 (16:43 -0500)
commit4ada337e86481e4e56820021910a8504df549692
treef9e74fac18e695f383e71a569d24fb6efbf38393
parentc1e28ca27ea8337e50b9b64c7f7a6d1f64b98655
parentdba4b42bad150a0390828c7895565453bf5463f2
Merge branch 'master' into stable