Updated PSTCollectionView from upstream.