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

Trivial merge