v3.7.0
b70c926f · Merge branch 'nathan_miller-master-patch-49221' into 'master' ·