Merge branch 'master' into '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also'

# Conflicts:
#   spec/lib/gitlab/ci/ansi2html_spec.rb