Fix XSS vulnerability
Merge branch 'master' of https://github.com/airbnb/rendr

Merged with the latest from Airbnb