Updates to faye/4d2dd62.