Merge branch 'master' into 'feature/new-comment'

# Conflicts:
#   src/components/answer/answer.js
#   src/components/question/question.js
1 job for !12 with feature/new-comment in 1 minute and 12 seconds (queued for 1 second)
merge request