Merge remote-tracking branch 'remotes/kraxel/tags/input-20180618-pull-request' into...