allow non-promises for 'collect'

[yanick]

Useful when you have a bunch of promises and non-promises and you want to say "here's the bag of stuff I'm waiting for, let me know when they are all ready, 'kthanxbye" :-)

[stevan]

Works for me! #merged