Latest changes on rc/2013-11-21 to master

This is the LTI grading work from the Blades team et al, rebased by Cale.