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