Sync'd branch releases/esr24 with upstream @ Tue Sep 23 19:25:14 PDT 2014