Keep up-to-date with Flambe upstream.
https://github.com/aduros/flambe/commit/4bde623ce0ab7cadb34b9146dab1106672d09a7d