travis fix
Merge remote-tracking branch 'remotes/origin/master' into mably

Conflicts:
	.travis.yml