Merge "Fix for Text::Controller." into devel/master