Merge remote-tracking branch 'github/pr/536'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 18 Jan 2016 17:07:23 +0000 (17:07 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 18 Jan 2016 17:07:41 +0000 (17:07 +0000)

Trivial merge