Merge pull request #186 from shinh/backport
authorFumitoshi Ukai <fumitoshi.ukai@gmail.com>
Wed, 10 May 2017 03:51:39 +0000 (12:51 +0900)
committerGitHub <noreply@github.com>
Wed, 10 May 2017 03:51:39 +0000 (12:51 +0900)
Backport internal changes


Trivial merge