fix criteria update for m2m
remove doubled colons
Merge remote-tracking branch 'upstream/master'