Commit from home
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gao_table_manager.c