Merge remote-tracking branch 'github/pr/297'.
authorPatrice Clement <monsieurp@gentoo.org>
Fri, 22 Jan 2016 10:38:10 +0000 (10:38 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Fri, 22 Jan 2016 10:41:04 +0000 (10:41 +0000)

Trivial merge