Collections are the shit
Merge remote-tracking branch 'upstream/1.3/develop' into 2.3/develop
Forgot a space
Another space
Another space
Merge pull request #2336 from swilla/2.3/develop

Collections?