Merge remote-tracking branch 'github/pr/611'.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 6 Jan 2016 21:03:44 +0000 (21:03 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 6 Jan 2016 21:04:10 +0000 (21:04 +0000)

Trivial merge