Merge branch 'gitfix' into shared_lib