fix sync to wordpress svn
Merge branch 'fix/20140116'