js fix
Merge branch 'master' into patmoore-master
1.1.1