Added Travis integration.
Merged branch '2.6.x' into 'master'.

Conflicts:
	.travis.yml