Ville Valjus

I'm reporting two partly related issues. I didn't have permission to push a branch and create a pull request, so I'm attaching Git patch files containing my suggested fix. The...