BUMP 2.8.0-rc3
Merge remote-tracking branch 'upstream/master'