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