V220 update
Merge branch 'work'

Conflicts:
	dofiles/cumul.do