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