Merging 3.3.x changes to master: o.c.formula.channelfinder, o.c.logbook.olog, o.c.pretune