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