Sync'd branch releases/aurora with upstream @ Thu Sep 25 09:12:31 PDT 2014