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