Merge remote-tracking branch 'github/pr/521'. Fixes bug 569504.
authorPatrice Clement <monsieurp@gentoo.org>
Sun, 27 Dec 2015 13:25:14 +0000 (13:25 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Sun, 27 Dec 2015 13:25:50 +0000 (13:25 +0000)

Trivial merge