Introduced polygon_sub term to replace sub() on polygons.
Merge branch 'daniel_3011' into next
Merge branch 'next' into sam_2134