Merge remote-tracking branch 'github/pr/294'. Fixes bug 564194.
authorPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 13:49:42 +0000 (13:49 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Tue, 17 Nov 2015 13:51:30 +0000 (13:51 +0000)

Trivial merge