Merge remote-tracking branch 'mauri/master' into develop
Merge branch '2-4-stable'