Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Fri, 3 Jun 2016 15:10:07 +0000 (15:10 +0000)
committerrsiddharth <rsd@gnu.org>
Fri, 3 Jun 2016 15:10:07 +0000 (15:10 +0000)

Trivial merge