mattdrayer/api - Proforma grading fix
Merge remote-tracking branch 'origin/release' into solutions-master