Initial merge with WP 4.1