Merge branch 'eliutt-branch'
Feb 17 suggested assignments (and requirements)
Merge branch 'master' into eliutt-branch