More JS 1.5 stuff
Merge branch 'develop'