Bugfix: NPE for annotations without tags
Merge branch 'master' into refactoring-wip