Merge pull request #2750 from yousong/reaver-fix