Merged PR for wptserve