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