Merged markup for a cygwin statechart failure from trunk to branch (this is a manual merge because a lot of changes were previously made to the 1.34 version only).