Bump to 4.2
Fix conflicts

Conflicts:
	.travis.yml