Merge remote-tracking branch 'github/pr/691'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 20 Jan 2016 08:59:11 +0000 (08:59 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 20 Jan 2016 08:59:45 +0000 (08:59 +0000)

Trivial merge