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