Revert "Merge branch 'origin/Semester'"

This reverts commit 72f4eb6c8fde6573843702c96a2d9740b2f467b4, reversing
changes made to 20130a20374b0eb76027ace226683372f857ce34.
Revert "Revert "Merge branch 'origin/Semester'""

This reverts commit e8ce1f514b1f9ac0fd6903ab23f8022fd94b4969.