Update code based to sync with Wordpress SVN.