Merge remote-tracking branch 'github/pr/784'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 5 Feb 2016 08:17:38 +0000 (08:17 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 5 Feb 2016 08:17:38 +0000 (08:17 +0000)

Trivial merge