Updated file with changes from rev 36232d82d1e99a4de60b10306e076c6e3bd51963