Timeout health check
Merge branch 'master' into select-this-option
Merge branch 'select-this-option' of github.com:conveyal/modeify into select-this-option
Fix show/hide buttons