Merging Superquadrics branch into Master.
Completing merge.