merge of localization branch into HEAD. mh and zap