Reran 2014-05-07
Merge branch 'master' of https://github.com/obdurodon/CollateOS