Merge branch 'revert-11f7570c' into 'master'

Revert "Merge branch 'testing' into 'master'"

See merge request !61
1 job for master in 2 seconds (queued for 3 seconds)