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