OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Tue, 2 Jul 2019 11:52:15 +0000 (20:52 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Tue, 2 Jul 2019 11:52:15 +0000 (20:52 +0900)

Trivial merge