Merge branch 'master' into column_callback

diff --cc lib/DBIx/Class/Schema/Loader/Base.pm
Simple merge
diff --cc lib/DBIx/Class/Schema/Loader/DBI.pm
Simple merge
		1	2
lib/DBIx/Class/Schema/Loader/Base.pm	patch \|	diff1 \|	diff2 \|	blob \| history
lib/DBIx/Class/Schema/Loader/DBI.pm	patch \|	diff1 \|	diff2 \|	blob \| history