Merge pull request #9959 from yuwata/small-fixes
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 29 Aug 2018 15:47:00 +0000 (17:47 +0200)
committerGitHub <noreply@github.com>
Wed, 29 Aug 2018 15:47:00 +0000 (17:47 +0200)
tiny fixes and a cleanup


Trivial merge