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