Add basic clipping and winding rule support
Merge branch 'master' into gh-pages