update to WP trunk