Merge "Fix for a single line text's vertical alignment." into devel/master