And a new test for the permitted kind of cycles.
merge bug25107 into default