let travis use `make test-eactest`
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.travis.yml