Merge commit 'origin/bug_69_configurable_inputdevice_delay'