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

Trivial merge