Replying to @dtanzer

@dtanzer Since the flow errors are not a result
of the the merge, you should fix them in a separate commit.

Mon, 16 Oct 2017 08:33:14 UTC