Merge pull request #3711 from mhei/fix-libcanfestival