Merge "Added IGNORE_SPACES_AFTER_TEXT property" into devel/master