Fix weird js issue
Merge branch 'master' into staging