Merge branch 'jc/allow-ff-merging-kept-tags'