Merge "Don't count '\r' in text-field" into devel/master