Merge branch 'master' into pb/gitpm