Merge "Fixed a bug where the numpad wasn't working correctly" into nyc-dev