Merge branch 'master' of github.com:fsprojects/SQLProvider into colinbull-master

Conflicts:
	src/SqlProvider.fsproj
	src/SqlRuntime.Common.fs
	src/SqlRuntime.QueryExpression.fs