Merge pull request #1402 from Rudloff/canalc2