2279971b6f
Merge commit '9795a25da060f9a7df87da8ab43fb1086d4322a5' * commit '9795a25da060f9a7df87da8ab43fb1086d4322a5': Refactor input reader to support new device types more easily.