Initial merge with WP 3.9.1