merging upstream changes

diff --cc WordPress.gitignore
index 0000000000000000000000000000000000000000,7194a5b96930c80bb3b55201ff79db9af4054de8..8e22e0e2fb0017324b5a91a68aff23d61637aed3
mode 000000,100644..100644
--- /dev/null
--- 2/WordPress.gitignore
+++ b/WordPress.gitignore
@@@ -1,0 -1,13 +1,12 @@@
 -wp-config.php
+ .htaccess
+ wp-content/uploads/
+ wp-content/blogs.dir/
+ wp-content/upgrade/
+ wp-content/backup-db/
+ wp-content/advanced-cache.php
+ wp-content/wp-cache-config.php
+ sitemap.xml
+ *.log
+ wp-content/cache/
+ wp-content/backups/
+ sitemap.xml.gz