Merge branch 'pixels' into 'master'

Pixels

See merge request !42
2 jobs for master in 1 minute and 12 seconds