followup to 4acfc5c6
Merge branch 'devel' into packaging