Change-Id: I398437db96082e8813090b5eb78ae1c8b8158ffe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>