Merge in changes from WP 3.8.3
Merge remote-tracking branch 'origin/master' into latest