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