Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	createCube.py

Edit:
    Fixed misspelling of prism.