Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Sat, 12 Nov 2016 19:12:38 +0000 (19:12 +0000)
committerrsiddharth <rsd@gnu.org>
Sat, 12 Nov 2016 19:12:38 +0000 (19:12 +0000)

Trivial merge