Change waitTimeout to not expire
Merge branch 'master' into threaded-comments