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

Trivial merge