Merge remote-tracking branch 'github/pr/598'
authorAndreas K. Hüttel <dilfridge@gentoo.org>
Sat, 2 Jan 2016 21:18:54 +0000 (22:18 +0100)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Sat, 2 Jan 2016 21:18:54 +0000 (22:18 +0100)

Trivial merge