Take care around JavaScript reserved word "class"

Addresses #884
Merge branch 'master' into develop

Merge in fix for #884

Conflicts:
	README.rst