Merge branch 'hotfix/20140430-trendmicro'
shinajs
Merge branch 'hotfix/20140502-sinajs' into develop