Merge branch 'master' into 'pablon'

# Conflicts:
#   .gitlab-ci.yml
12 jobs for pablon in 143 minutes and 48 seconds (queued for 13 seconds)
Status Name Job ID Coverage
  Build
passed Linux32 #11175
linux32

00:11:06

passed Linux32-snapshot #11181
linux32

00:11:22

passed Linux64 #11174
linux64

00:10:51

passed Linux64-snapshot #11180
linux64

00:10:40

passed Osx #11177
osx

00:11:20

passed Osx-snapshot #11183
osx

00:11:03

passed RaspberryPi #11176
raspi

00:09:08

passed RaspberryPi-snapshot #11182
raspi

00:10:33

passed Win32 #11173
windows

00:14:02

passed Win32-snapshot #11179
windows

00:14:29

passed Win64 #11172
windows

00:14:44

passed Win64-snapshot #11178
windows

00:14:24