Merge "Fix for text cursor." into devel/master