Sync'd branch releases/aurora with upstream @ Thu Nov  6 12:33:40 PST 2014