Protocol change, Fix handling of end of definition
Merge branch 'master' of github.com:def-lkb/merlin
Add printing of types with :TypeOf