Merge remote-tracking branch 'github/pr/407'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 27 Nov 2015 22:03:17 +0000 (22:03 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 27 Nov 2015 22:03:58 +0000 (22:03 +0000)

Trivial merge