This should finally fix #6896. Let's watch the buildbots.
2 files changed