Sync'd branch releases/aurora with upstream @ Thu Nov  6 14:16:51 PST 2014