Merge pull request #756 from plehegar/master

Update to latest wptserve