CHANGE: Merge in latest changes from Standard as to standard gauge railway tracks