Merge remote-tracking branch 'github/pr/680'. Fixes bug 572060.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 19 Jan 2016 08:34:31 +0000 (08:34 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 19 Jan 2016 08:35:24 +0000 (08:35 +0000)
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

Trivial merge