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