Merge remote-tracking branch 'github/pr/954'
authorAndreas K. Hüttel <dilfridge@gentoo.org>
Tue, 1 Mar 2016 14:25:49 +0000 (15:25 +0100)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Tue, 1 Mar 2016 14:25:49 +0000 (15:25 +0100)

Trivial merge