Commenting.
Merge remote-tracking branch 'origin/master' into AH-260_text_rendering