Fix exception.
Fix EduEdition build (take 8)
Merge remote-tracking branch 'origin/master'