Merge remote-tracking branch 'github/pr/264'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 19 Oct 2015 21:49:11 +0000 (21:49 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 19 Oct 2015 21:50:18 +0000 (21:50 +0000)

Trivial merge