Merge remote-tracking branch 'github/pr/626'.
authorPatrice Clement <monsieurp@gentoo.org>
Sun, 10 Jan 2016 20:41:57 +0000 (20:41 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sun, 10 Jan 2016 20:41:57 +0000 (20:41 +0000)

Trivial merge