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