Merge branch 'gitrev'