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