Merge remote-tracking branch 'github/pr/711'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 23 Jan 2016 17:48:29 +0000 (17:48 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 23 Jan 2016 17:49:25 +0000 (17:49 +0000)

Trivial merge