Updates from the upstream restler repo

Merged from danwrong/restler.