Merge pull request #942 from nico/cyclefix2