Concerning #787: Tentative fix
automatic casadibot merge