Merge remote-tracking branch 'github/pr/917'
authorAndreas K. Hüttel <dilfridge@gentoo.org>
Thu, 25 Feb 2016 04:15:55 +0000 (05:15 +0100)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Thu, 25 Feb 2016 04:15:55 +0000 (05:15 +0100)

Trivial merge