* changes:
  [automerger skipped] Merge changes Ic879c4c2,Ib8776101 am: 69e22e9e am: 08fae357 am: e40a8e99 -s ours am: 40c0286e -s ours am: 3df56b4d -s ours
  [automerger skipped] InputDispatcher: Use floats to represent location coordinates am: db326da3 am: 264a82f0 am: c84d6d7d -s ours am: 81c23a62 -s ours am: 458b1e3f -s ours