Close dangling file.  Bug 1379
Move DSN support to mainline
Affects bug 893