Merge remote-tracking branch 'github/pr/389' courtesy of Sean Vig.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 23 Nov 2015 15:04:06 +0000 (15:04 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 23 Nov 2015 15:04:06 +0000 (15:04 +0000)

Trivial merge