fix 2 for travis encrypted env-variables support
Merge remote-tracking branch 'origin/master'

Conflicts:
	.travis.yml