Commit c1e46018 authored by Cedric Roux's avatar Cedric Roux

Merge remote-tracking branch 'origin/nokia-fixes-w08' into develop_integration_w09

parents 05f89b39 f94835be