Fix args.test broken by the previous commit.
Merge branch 'stable'