post 2.7.0
Merge remote-tracking branch 'upstream/master'