Merge remote-tracking branch 'github/pr/540'.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 28 Dec 2015 09:55:12 +0000 (09:55 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 28 Dec 2015 09:55:12 +0000 (09:55 +0000)

Trivial merge