Merge with wp repository version

Update to match SVN