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