Merged changes from TourDeFrance-0.3 branch into master.