Merge pull request #3997 from anmonteiro/anmonteiro/refmt-fixed-regressions

Add current refmt master with fixed regressions

Author: bobzhang