weird jquery change
pre merge
Merge branch 'master' into refactor

* master:
  pre merge
  weird jquery change