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