It might also be better (merge-conflict-wise) if https://github.com/oaeproject/Hilary/pull/649 can be merged before this one. (I can do any timeout/jsdoc related follow-up commits in this PR)