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