From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Tue, 2 Jul 2019 11:52:15 +0000 (+0900)
Subject: Merge master into develop
X-Git-Url: http://git.osdn.net/view?p=mikutoga%2FTogaGem.git;a=commitdiff_plain;h=c7fcb9ef868375fc50b49736daf5e9136e521156;hp=ca790c392b3e12ba485b897aa10334aff7fce4b1

Merge master into develop
---