Merged PR#724 for retina text display