Merge 'DBIx-Class-current' into 'trunk'

diff --cc Changes
Simple merge

diff --cc lib/DBIx/Class/Schema.pm
Simple merge

diff --cc lib/DBIx/Class/Storage/DBI.pm
Simple merge

diff --cc lib/DBIx/Class/UUIDColumns.pm
Simple merge