Merge in changes from WP 3.8.3