Merge branch 'customsql' into dev

Conflicts:
	src/NHibernate/Loader/BasicLoader.cs
	src/NHibernate/Loader/Custom/CustomLoader.cs
	src/NHibernate/Loader/Custom/Sql/SQLCustomQuery.cs