More flakey goodness
Merge pull request #209 from psav/flakey-goodness

Flakey goodness