Sync'd branch releases/aurora with upstream @ Thu Sep 25 06:58:43 PDT 2014