fixing EMCA-262 parse errors from jshint
Merge branch 'emca262' into develop