Upped Version: 3.7.0
Merge remote-tracking branch 'upstream/master'