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

Conflicts:
	lfs/manage/tests.py