WP update to 4.0
WP update to 4.0 part 2