Merge remote-tracking branch 'github/pr/502'. Fixes bug 568958.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 21 Dec 2015 23:53:16 +0000 (23:53 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 21 Dec 2015 23:53:16 +0000 (23:53 +0000)

Trivial merge