Merge commit '3e2848bcec49370394f9fdc8609de5c16904c934' into itmagination_mods

Conflicts:
	src/NHibernate/AdoNet/SqlClientBatchingBatcher.cs