Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Wed, 30 Nov 2016 20:33:43 +0000 (15:33 -0500)
committerZak Rogoff <zak@fsf.org>
Wed, 30 Nov 2016 20:33:43 +0000 (15:33 -0500)
commitff1eb442d99e4628413bf977204d03b151da64f7
treef88686c8c31b568a9775d62dca7b2cdf833842bd
parentff51f88ea20abe0ea979f7eda935c00892af4785
parent30c0c01f9bf54b3cbf6a04a3eb2ac6a439e8d90b
Merge branch 'master' into stable