Merge branch 'jc/push-follow-tag'