Merge remote-tracking branch 'upstream/master'

Conflicts:
	cliforms.py
	grade.py