cancel jquery action
Merge branch 'master' into staging