Syncing with wordpress svn

sync with v 1.1.0.1