Imported Upstream version 3.7~beta1
Merge tag 'upstream/3.7_beta1'

Upstream version 3.7~beta1
prepare 3.7~beta1-1 release