Sync'd branch releases/esr24 with upstream @ Wed Aug 27 11:39:06 PDT 2014