Make fixtures easier to extend
Merge pull request #1381 from umpirsky/fix/extensible-fixtures

Make fixtures easier to extend