Updated to latest upstream wptserve.