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