Increment 4.1 version.
Fix conflicts.
Merge branch '4.2'