Merge pull request #1591 from akoeplinger/remove-npgsql