Merge pull request #3058 from lioncash/override ControllerInterface: Fix -Winconsistent-missing-override warnings on OSX
