Skip to content
Commit efb68586 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Rel-17' into 'Rel-18' 

Merge the latest Rel-17 updates into Rel-18 agreed, according to SA5#143e and SA#96

See merge request !354
parents d33610d2 b70f67e7