Changes applied 2014-11-04
Merge remote-tracking branch 'origin/TFC-Updates'