RFC, not RFTD
Merge pull request #853 from tomprince/patch-1

RFC, not RFTD