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