Merging changes from main trunk.

Merging changes from main trunk.
More from Raiz folks's main trunk.
Allow setting controller on a fetched collection to nil.

Allow setting controller on a fetched collection to nil.