Updated annotation.c
method deduplication
(cherry picked from commit e93325e8d44e991e3a8a1468408b024672437e7c)

Conflicts:
	ext/annotations/annotation.c
Partial backport of #1137; Fix #1131
Unit test
Regenerated build/ files
Merge pull request #1338 from sjinks/1.2.4

[1.2.4] Backport of #1137