Merge "Correctly render text when coordinates are not integers. Bug #3225632"