Change-Id: I34282a36db8af9c5550ee4c9080519ce0c096d8e Reviewed-by: Marco Bubke <marco.bubke@digia.com>