Merge recent changes from WikiTravel to WikiVoyage