Merged changes back into Npgsql2010