running working tests only
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.travis.yml
Merge pull request #1462 from diegosarmentero/master

running working tests only