Merge "Add support for text geometry" into devel/master