determine proper script insertion node, only add xpathHelper if necessary
Fix some FF incompatibilities
Merge branch 'master' into feature/foxhound
Merge branch 'master' into feature/foxhound
Merge branch 'master' into feature/foxhound
Merge branch 'feature/foxhound'