Merge pull request #17 from savoirfairelinux/7.0-m2m-context