Sync'd branch releases/aurora with upstream @ Thu Aug 28 08:53:32 PDT 2014