Update: WordPress 3.9 compatibility
Merge branch 'wp-3.9-compat' into develop