Fix typo.
Add 2.1.1 changes.
Fix typo.
fix 10.9 compilation without enable c++11

(cherry picked from f762e91940ff)
fix finding of git version on master

close #586