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