Merge "Fix for text handle positioning." into devel/master