Release 3.7

merge 3.7 up to master