Merge branch 'master' into stable.
authorDavid Thompson <davet@gnu.org>
Thu, 18 Sep 2014 14:29:34 +0000 (10:29 -0400)
committerDavid Thompson <davet@gnu.org>
Thu, 18 Sep 2014 14:29:34 +0000 (10:29 -0400)

Trivial merge