major release of open colibri
attempt to merge branches