Change-Id: I8b180ac6414936b45063cd721a12b146b4203736
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>