Support non-JSON script attributes
Merge pull request #2315 from guybedford/master

Support non-JSON script attributes