travis use same merge as build and test for push

[merge]
Merge branch 'master' into travis-merge-on-commitmessage

Conflicts:
	.travis.yml
Merge to master
[merge]