Sanitization cleanup (not needed on input)
Merge branch 'master' of https://github.com/sambolek/magento