Correct shapes mixin conditional logic, 0 radius spat out for oval
Merge branch 'hotfix/2.5.2'