Gh upstream patch

remaining patch from: http://wordpress.org/support/topic/deprecation-notice-and-patch-wordpress-38