From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Sun, 2 Jun 2019 12:48:32 +0000 (+0900)
Subject: Merge master into develop
X-Git-Tag: release-3.120.2^2~5
X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=commitdiff_plain;h=f2ab5260024054826a5817b9c5dcb3d1c864aea9

Merge master into develop
---

f2ab5260024054826a5817b9c5dcb3d1c864aea9