uh oh, merge conflict (i hope)
Merge branch 'v42'