merge of working copy with jan 17 changes from zmenu