Merge remote-tracking branch 'github/pr/533'.
authorPatrice Clement <monsieurp@gentoo.org>
Sun, 27 Dec 2015 10:12:04 +0000 (10:12 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sun, 27 Dec 2015 10:15:28 +0000 (10:15 +0000)

Trivial merge