Michael Osipov - 2021-01-05

Port maintainer here, I accepted the change from @pkubaj and it builds smoothly now.