Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 6 Oct 2016 15:12:57 +0000 (11:12 -0400)
committerZak Rogoff <zak@fsf.org>
Thu, 6 Oct 2016 15:12:57 +0000 (11:12 -0400)
commitdc24e5d910ffb29dc026b2b0fcd22bbb33c4f515
tree7be8e3dd92ed9432c0b9f31fea54bc9ef7f71378
parent0ad237e3eed2d9844aa5da6b67af83a7e9325af1
parentaee55fc15458a637e07a8c8f6d2a9c13fdad7d4f
Merge branch 'master' into stable