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