1.6 for 1.7

merge of 1.6 + prepare for 1.7.2 release