missing flint_cleanups
Merge remote-tracking branch 'fredrik/trunk' into trunk