Sync'd branch releases/aurora with upstream @ Thu Aug 28 13:58:34 PDT 2014