Update to CM 1.82.2
Merge remote-tracking branch 'upstream/master' into cm-1.82.2

Conflicts:
	composer.lock
Merge pull request #339 from njam/cm-1.82.2

Update to CM 1.82.2