Sync'd branch releases/aurora with upstream @ Thu Aug 28 10:30:30 PDT 2014