Merge "Fix for cursor position when a void text is set." into devel/master