Attempt to fix buildbot errors for picky compilers
Merge branch 'logg/topic-multimesh' into next