Update 3.4.16. Match adjustments made by @1982strand in his danish repo.
update 3.4.17