Update to latest wptserve
Merge remote-tracking branch 'upstream/master'