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