Upgrade to WP 3.5.1
Merge branch 'vendor-wordpress'