Initial merge of WP 3.9.0