merge from progit