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