property __name__
Merge branch 'master' into kissy
merge master