Merge branch 'jc/gitpm'