Misc FTR changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	hodor/commands/cmd_faux-table-replace.py