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

Trivial merge