Merge "fix issue with text size with negative line spacing" into devel/master