OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Thu, 6 Jun 2019 04:28:18 +0000 (13:28 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Thu, 6 Jun 2019 04:28:18 +0000 (13:28 +0900)

Trivial merge