More JS errors to ignore
Merge branch 'dev'