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