Minor fixes.
Merge branch 'master' of https://github.com/Infosfer/cocos2d-x