Merge branch 'master' into tc
Merge branch 'master' into tc
action can give event object
stop animation if push shiftKey
Merge branch 'tc'