Tutorial #16 fix (box added)
Merge tag 'v0.17.0' into objfix
Merge tag 'v0.18.0' into objfix
Merge tag 'v0.20.0' into objfix
Merge branch 'objfix'

Conflicts:
	models/box.obj