Release 3.7

10/13 merge to master