Upgrade to wordpress 3.6.1
Merge branch 'upstream'