Entity Framework/LINQ support merged from Ruetzel's main branch.