Merge "Support 3.7.0" into idea133
 Auto-merge: e6be8d9

* commit 'e6be8d98dbe50ab69b254ce83cede0b5c8c1f895':
  Support 3.7.0