OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Sun, 2 Jun 2019 12:48:32 +0000 (21:48 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Sun, 2 Jun 2019 12:48:32 +0000 (21:48 +0900)

Trivial merge