OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Tue, 4 Jun 2019 13:35:54 +0000 (22:35 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Tue, 4 Jun 2019 13:35:54 +0000 (22:35 +0900)

Trivial merge