Merge changes in from WordPress.com [upstream]