timeout fix

Signed-off-by: Jamie White <hello@jamie-white.com>
Merge branch 'master' of https://github.com/RhythmDigital/az-esc2014