Merge remote-tracking branch 'github/pr/367'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 25 Nov 2015 19:21:45 +0000 (19:21 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 25 Nov 2015 19:22:08 +0000 (19:22 +0000)

Trivial merge