Merge branch 'garden-shears'