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