Fixed bug with seeing incoming Collaborative capsules in Inbox (Sam N, John K)
Merge remote-tracking branch 'origin/master'