Fixes #826
automatic casadibot merge