Merge remote-tracking branch 'github/pr/703'. Fixes bug 560362.
authorPatrice Clement <monsieurp@gentoo.org>
Mon, 25 Jan 2016 08:57:58 +0000 (08:57 +0000)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 25 Jan 2016 08:58:49 +0000 (08:58 +0000)

Trivial merge