misc
Merge branch 'origin/d2tmo'
Update input.c
Merge remote-tracking branch 'upstream/d2tmo' into n7100