Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream1/develop' into develop
Update CCLabelTTF.js

add param context to method visit()
Merge pull request #1106 from WanderWang/develop

Add param context to method visit() in cc.LabelTTF