timeout fixes
Merge branch 'ship-zf' of github.com:fishlamp/FishLamp into ship-zf