Merge branch 'v3.1' into develop
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop
Reapplying the render state fix CCLabelTTF. Looks like it was accidentally removed when reverting other changes.