Changes applied 2014-11-10 (Part 2)
Merge remote-tracking branch 'origin/TFC-Updates'
Merge branch 'master' of https://github.com/Bletch1971/TFCraft