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