Merge branch 'robot_components' of cil.li:oc into recipes