Don't merge--issue #4689:Game controller support