Sync'd branch releases/aurora with upstream @ Thu Sep 18 08:34:35 PDT 2014