Bugfix when unbinding the typing directive.
Merge branch 'develop' into annotated-events