Fix fixtures
Merge remote branch 'upstream/master'