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