OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Thu, 4 Jul 2019 07:38:10 +0000 (16:38 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Thu, 4 Jul 2019 07:38:10 +0000 (16:38 +0900)

Trivial merge