Merge remote-tracking branch 'remotes/github/pr/437'
authorOle Reifschneider <tranquility@gentoo.org>
Mon, 7 Dec 2015 20:47:30 +0000 (21:47 +0100)
committerOle Reifschneider <tranquility@gentoo.org>
Mon, 7 Dec 2015 20:47:30 +0000 (21:47 +0100)

Trivial merge