Merge remote-tracking branch 'github/pr/513'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Dec 2015 10:01:43 +0000 (10:01 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 23 Dec 2015 10:01:43 +0000 (10:01 +0000)

Trivial merge