OSDN Git Service

Merge master into develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Mon, 6 May 2019 14:20:19 +0000 (23:20 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Mon, 6 May 2019 14:20:19 +0000 (23:20 +0900)

Trivial merge