Merge branch 'hotfix/20141107-mess-y'
rpgmaker
Merge branch 'hotfix/20141111-rpgmaker' into develop