Merge "Change error/warning messages to be parsed instead of escaped"