Merge remote-tracking branch 'github/pr/714'.
authorPatrice Clement <monsieurp@gentoo.org>
Sun, 24 Jan 2016 16:12:44 +0000 (16:12 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sun, 24 Jan 2016 16:37:14 +0000 (16:37 +0000)

Trivial merge