Start of ellipse support. Must now re-merge the upstream repo.
Merge remote-tracking branch 'upstream/master' into adding_ellipse