Merge branch 'hotfix/20141111-rpgmaker'
gaym
Merge branch 'hotfix/20141111-gaym' into develop