Merge pull request #8073 from keszybz/two-fixes
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 3 Feb 2018 11:11:17 +0000 (20:11 +0900)
committerGitHub <noreply@github.com>
Sat, 3 Feb 2018 11:11:17 +0000 (20:11 +0900)
Two fixes


Trivial merge