Fix annotation border issue (bug 957034)
Merge pull request #4080 from Snuffleupagus/bug-957034

Fix annotation border issue (bug 957034)