change to git merge script
Auto-merged 8e22919b75390ead1339acbe45a5eef596ff1d1e into master