2.7.8 production.
Merge remote-tracking branch 'upstream/master'