Merge remote-tracking branch 'github/pr/789'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 4 Feb 2016 18:53:48 +0000 (18:53 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 4 Feb 2016 18:53:48 +0000 (18:53 +0000)

Trivial merge