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