Merge branch 'master' of github.com:typetools/annotation-tools