Removing the need for Mechanic to set the default timeout to 0
Merge branch 'no_zero_timeout'