Fix detection of versions with git 1.8+, fixes #2065
Fix 5.3.3 build
Oops