Clean merge of improved datetime handling code
Merge remote-tracking branch 'dat/datetime'

Conflicts:
	lib/Column.php