Use $TRAVIS_BRANCH instead of hardcoding it
Merge branch 'QA_4_1'

Conflicts:
	.travis.yml
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin