Merge from progit