Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 2 Sep 2016 14:45:37 +0000 (10:45 -0400)
committerZak Rogoff <zak@fsf.org>
Fri, 2 Sep 2016 14:45:37 +0000 (10:45 -0400)
commitfb4d55e7f8bcea2c3b28a80adfe8a777b14499ed
tree727e61ec255aafbae8efc014489d606737665c65
parenta7e6b4c441cb8a08a3412c4426cf2af118724ff0
parent1a4e3bd6013d7cc3c34eaa324e82f55f58299f97
Merge branch 'master' into stable