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