From f1174a15e04a83a7c8070aac7de14d22231512e3 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 23 Aug 2018 16:37:07 +0900
Subject: [PATCH] Merge pull request #2423 from syuilo/develop (#2425)