Merge remote-tracking branch 'github/pr/546'.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 29 Dec 2015 00:08:10 +0000 (00:08 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 29 Dec 2015 00:08:10 +0000 (00:08 +0000)

Trivial merge