Commit before first semester meeting.
Merge branch 'master' of https://github.com/avigad/isabelle
Apparently there is a merge conflict; should not be serious.
Completed merge.