Merge branch 'sp/msysgit'