#2465 r23269 - r23272, r23274 - r23275, r23277 - r23278 をマージ

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