Merge develop into deploy 

Last merge was done with a stale develop so some things were missing. Merging again...