cleanup
Merge remote-tracking branch 'collective/master'