Sync'd branch releases/aurora with upstream @ Thu Nov  6 10:59:25 PST 2014