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