post 2.8.0-rc2
Merge remote-tracking branch 'upstream/master'