Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 8 Dec 2016 16:46:10 +0000 (11:46 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 8 Dec 2016 16:46:10 +0000 (11:46 -0500)
commitcfeb6d5720697546e6720031dc010a017ad8e926
tree617a7f3f9dc8339f4d3a79e14b1214715c65189a
parent208e8b5197830864f17d36ad4329d5f7d8d63774
parent778bd6625b9142e47556975864903b96c0e024aa
Merge branch 'master' into stable