From 865b9a613ee6db0c2e3eca142a1fe447360749b7 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Thu, 23 Apr 2015 16:18:07 +0000
Subject: [PATCH] Branch 4.2.

Built from https://develop.svn.wordpress.org/@32278

git-svn-id: http://core.svn.wordpress.org/branches/4.2@32249 1a063a9b-81f0-0310-95a4-ce76da25c4cd