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