merge back master to develop
See merge request !153 (merged)
enabled an automatic merge when the pipeline for 80a4c3a4 succeeds
mentioned in commit 4338c2c7
merged