Merge remote-tracking branch 'github/pr/648'. Fixes bug 571728.
authorPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 14:33:46 +0000 (14:33 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Wed, 13 Jan 2016 14:35:49 +0000 (14:35 +0000)

Trivial merge