No infinity timeout, we could deadlock with the application controller on shutdown.
merge bug25571 into stable
merge stable into default
merge heads