#2363 r23177, r23181 - r23186, r23188 - r23191, r23194, r23197, r23199 - r23218, r23220, r23223 - r23225 をマージ

git-svn-id: http://svn.ec-cube.net/open/branches/version-2_13-dev@23230 1e3b908f-19a9-db11-a64c-001125224ba8