Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Thu, 21 Dec 2017 21:37:04 +0000 (16:37 -0500)
committerMolly de Blanc <molly@fsf.org>
Thu, 21 Dec 2017 21:37:04 +0000 (16:37 -0500)
commitc1e28ca27ea8337e50b9b64c7f7a6d1f64b98655
treea99bc33d1520cc8389c0ca56bd28e2be6275ad22
parent300bd81f54fcd9e48da4d9ed8ddfc5669f75a341
parentef693260a3fa88f1caea96c5344559afec413eee
Merge branch 'master' into stable