Legy (Beini) authored 4 years ago and Jens Nolte committed 3 years ago

This is not working flawlessly, but is is an improvement. Maybe someone
with more bash voodo can work out the proper solution.