Conflicts:
	render.py
Merge in parent.
Restore Python 2.6 compatability.