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