Adding support for standard tables to importer.
Merge remote-tracking branch 'origin/master'

Conflicts:
	base.yaml