Merge remote-tracking branch 'github/pr/816'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 8 Feb 2016 21:19:45 +0000 (21:19 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 8 Feb 2016 21:19:45 +0000 (21:19 +0000)

Trivial merge