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