Resolve master merge conflicts.
Merge pull request #372 from snimmagadda/54-dsn

Resolve master merge conflicts.