daurer Merge pull request #477 from ptycho/hotfixes