Merge remote-tracking branch 'github/pr/543'. Fixes bug 568878.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 28 Dec 2015 09:52:02 +0000 (09:52 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 28 Dec 2015 09:52:02 +0000 (09:52 +0000)

Trivial merge