Improve Express support.
Merge commit '8a1e1d6315f45ad377b57ec424f58a3f03aeb214'