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