Typo, rdiscount, etc.
Merge branch 'dev'