Final Enroll pull request.

All pull problems (an fetch and merge) should be fixed now.