Merge the OpenTTD update from 0.3.10 branch