Merge branch 'devel' into 'master'

Ensure master has the latest fixes from devel included

See merge request !235