Change-Id: I25dc6d2992831d79077e4d06f52018d6191e0bfb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>