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

Trivial merge