Merge branch 'hotfix-1.6.20'
Fixed the funny annotation that started showing up next to the +1 button.
Bumped version
Merge branch 'hotfix-1.6.21' into develop