Merge updates from WP 3.8.2