Added new repo: collective.base
Merges upstream.
Merge pull request #658 from taito/master

Added new repo:collective.base