Fix uniqueness check of answers
Merge remote-tracking branch 'origin/master'