merge of www_www update by Oleg Kirillov (with my corrections)