#33 Timestamp is not always correctly formatted for TeamCity
Merge remote-tracking branch 'origin/master' into tests

Conflicts:
	test/test-unittest.py
test for #33 in tests branch