Merge TourDeFlex 1.1 into master