Issue 216 pin flow rebase

This is the same as Pull Request #21 but it has been rebased.

We'll merge this down to train-2013.05.29, which would be a production hotpatch train.