Development of merchant ship propulsion machinery over the past 25 years