ScannerTable failures
Merge remote-tracking branch 'origin/master'

Conflicts:
	ScannerTable.csv