Merge remote-tracking branch 'Rudloff/canalc2'