Merge remote-tracking branch 'github/pr/2098'
authorSebastian Pipping <sping@gentoo.org>
Wed, 17 Aug 2016 17:58:14 +0000 (19:58 +0200)
committerSebastian Pipping <sping@gentoo.org>
Wed, 17 Aug 2016 17:58:14 +0000 (19:58 +0200)

Trivial merge