Fix bug 1044093 - Provide safe macro display in kumascript error messages
Merge pull request #2702 from darkwing/1044093-error-messages

Fix bug 1044093 - Provide safe macro display in kumascript error messages