Initial merge of WP 4.0.1 security update
Remove PHP4 style constructor from fields_map.php
Merge remote-tracking branch 'origin/master' into latest