shawnht delete ftr files
Merge branch 'develop'