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