From bb6328fda96e107e7bad413b1056eea113ebc39e 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)