Merge branch 'unite'

Conflicts:
	src/gear/table_translator.cc