HansaJet: also merge r3612 from trunk
Authored by: torstendreyer 2018-10-19
Parent: [r3617]
Child: [r3619]