trying to figure out linaro issue on ci server

Conflicts:
	.travis.yml