Merge remote-tracking branch 'github/pr/431'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 9 Dec 2015 23:35:17 +0000 (23:35 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 9 Dec 2015 23:37:44 +0000 (23:37 +0000)

Trivial merge