Merged Alex Bilbies MSSQL changes.