Merge branch 'master' into 'patch-1'

# Conflicts:
#   app/src/main/res/values-br/strings.xml
4 jobs for patch-1
Status Job ID Name Coverage
  Build
canceled #110
build

failed #106
build

 
  Test
canceled #108
allowed to fail
code_quality

canceled #107
test