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