Restored IVAR used by DTRichTextEditor
Merge branch 'master' into develop
added unit test for #498
Merge branch 'od/issue_498' into develop
Merge branch 'develop'