version sync to wp svn
Merge branch 'dev'