Flaky goodness for fixtures/
Manual merge of pull request #237