Merge remote-tracking branch 'github/pr/679'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 18 Jan 2016 20:47:30 +0000 (20:47 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 18 Jan 2016 20:48:38 +0000 (20:48 +0000)

Trivial merge