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