Sync'd branch releases/esr24 with upstream @ Tue Sep 23 21:54:16 PDT 2014