Merge release-3.7 to master

10/01/2013 merge