Fix behat scenario for association creation
Merge branch 'master' into 1.0