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