Merge "Fix for Text::Controller::RepositionSelectionHandles()" into devel/master