Update flambe from upstream.
Flambe 4.0 fixes.