Sync'd branch releases/aurora with upstream @ Thu Nov  6 11:26:44 PST 2014