Sync with updates from iRail master