Install Git 1.8.5.1 instead of 1.8.5 in the older templates.
Install Git 1.8.5.1 instead of 1.8.5 in the current templates.
Merge branch 'update/git.1.8.5.1'