Merge remote-tracking branch 'github/pr/712'.
authorPatrice Clement <monsieurp@gentoo.org>
Sat, 23 Jan 2016 17:54:04 +0000 (17:54 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sat, 23 Jan 2016 17:54:22 +0000 (17:54 +0000)

Trivial merge