2.8.4
Merge remote-tracking branch 'upstream/master'

catch up with vfr/Reader upstream