Merge branch 'master'
authorj8takagi <j8takagi@nifty.com>
Tue, 12 Feb 2019 12:29:29 +0000 (21:29 +0900)
committerj8takagi <j8takagi@nifty.com>
Tue, 12 Feb 2019 12:29:29 +0000 (21:29 +0900)

Trivial merge