Sync with dev SVN.
Revert "Sync with dev SVN."

This reverts commit e14216ed6e8b4151c9501ca622540d36f753cae9.
Merge branch 'master' of https://github.com/b2evolution/b2evolution