added git specific
Merge branch 'master' into newer
merge info