Sync'd branch releases/aurora with upstream @ Thu Nov  6 09:41:18 PST 2014