Updated to match WP Trunk