Merge dev scripts branch since their doctests are changed by the new git
fixing git interface doctests for new git version
Merge branch 't/15468/git_1_8_4_4' into develop