Sync'd branch releases/aurora with upstream @ Thu Nov  6 06:00:46 PST 2014