Merge branch 'tm-merge-upstream' into 'master'

Merge upstream

See merge request !3
2 jobs for master in 9 minutes and 51 seconds
Status Job ID Name Coverage
  Test
passed #234760
android
test

00:07:21

 
  Build
passed #234761
android
build

00:02:30