Enabled travis-ci on old branch
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	.travis.yml