Release 3.7

Merge to master 10/9/2013