Syncing with npgsql master

Synchronizeing with the npgsql:master