Merge pull request #2 from cocos2d/develop

merge 4.2
#249 fixed finally
Merge pull request #312 from longyangxi/dev0403

#249 bug fixed finally