Merge remote-tracking branch 'github/pr/516'.
authorPatrice Clement <monsieurp@gentoo.org>
Thu, 24 Dec 2015 00:06:29 +0000 (00:06 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Thu, 24 Dec 2015 00:06:29 +0000 (00:06 +0000)

Trivial merge