Merge remote-tracking branch 'github/pr/720'. Fixes bug 569110.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 25 Jan 2016 09:44:19 +0000 (09:44 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 25 Jan 2016 09:44:43 +0000 (09:44 +0000)
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

Trivial merge