rotation changes 11/25
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gz.h