Merge pull request #256 from pimpreneil/1.2

Add inheritance support for fixtures with many to many relationship
Merge branch '1.4' into survos