Brings in changes from 1.9.2 update
Updates some formatting to match VIP code standards, adds some escaping