Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Fri, 7 Oct 2016 05:31:40 +0000 (05:31 +0000)
committerrsiddharth <rsd@gnu.org>
Fri, 7 Oct 2016 05:31:40 +0000 (05:31 +0000)

Trivial merge