Updated to WP 3.9.
Merge branch 'contrib'