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