"better" timestamp
testcase.py: template and datafile customizable
fix
Merge remote-tracking branch 'upstream/master'