Merge steipete/PSTCollectionView master