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