Merge pull request #1455 from ESwordTheCat/riW3nfAj

emergency HTML/JS injection fix (Baystation12#6195 and Baystation12#6196).
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj