Merge branch 'master' into '52-charts'

# Conflicts:
#   .gitignore
1 job for 52-charts in 25 seconds
latest
Status Name Job ID Coverage
  Test
passed test #1336269

00:00:25