Sync'd branch releases/esr24 with upstream @ Mon Aug 25 05:20:23 PDT 2014