Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Mon, 26 Oct 2015 15:55:06 +0000 (11:55 -0400)
committerrsiddharth <rsd@gnu.org>
Mon, 26 Oct 2015 15:55:06 +0000 (11:55 -0400)

Trivial merge