Initial merge of WP 4.0.1 security update