Change-Id: I4d68734b2d30d7922359020ea2c64d764d6efb7a Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>