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