Merge in updates from WP 3.9.2