Merge branch 'devel'
Merge remote-tracking branch 'origin/devel'
Merge branch 'master' into devel

This is to make sure we don't have anything in 'master' that is forgotten
somehow in the 'devel' branch and could lead to conflicts later.