flake
Merge pull request #466 from almarklein/misc-tweaks

flake remaining from #465