mike:
	- Fix for ticket 1045
	- ## X-Compatible-With: 30300
John Pasula:
	- Update some comments.
