minor fix in datatable
synced with hermes/devel
Merge remote-tracking branch 'kus/master'

Conflicts:
	hermes