Merge branch 'defaultStringType' of https://github.com/kppullin/dapper-dot-net into kppullin-defaultStringType

Conflicts:
	Dapper/SqlMapper.cs