Prep for WP 4.1 merge