Merge release 0.42 into master

Merge release 0.42 into master.

Exception: Code Mirror SHA has already been updated in master, so don't merge one from release branch.