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