Update gitig2
Merge branch 'develop' into staging