Merge branch 'master' into develop
I had sth in mind with this change, but I forgot what ;)
Merge branch 'release/r1.0.0'