Merge branch 'bugfix/980-polls-double-vote' into 'develop'