Merge pull request #1783 from vladon/Visual-Studio-new-database-engine

Visual studio new database engine