Updated the travis config again
Merge remote-tracking branch 'origin/0.8'

Conflicts:
	.travis.yml