Merge remote-tracking branch 'github/pr/1997'
authorSebastian Pipping <sping@gentoo.org>
Sat, 6 Aug 2016 12:45:54 +0000 (14:45 +0200)
committerSebastian Pipping <sping@gentoo.org>
Sat, 6 Aug 2016 13:05:24 +0000 (15:05 +0200)

Trivial merge