Merge "Fixes for text layout." into devel/master