Sync'd branch releases/esr24 with upstream @ Sat Aug 23 03:17:26 PDT 2014