gitinfo modifications fix
Merge branch '1.0.x'