Merge remote-tracking branch 'upstream/3.4_Release' into Issue_458

Conflicts:
	Web Applications/TM_Website/Javascript/TM.Gui/TM.Gui.DataTable.js