Sync'd branch releases/aurora with upstream @ Mon Aug 25 11:32:29 PDT 2014