fix issue with being able to pass a Collection2 as the schema
Merge origin/master