Merge "KeyEvent class pimpling" into devel/master