Merge branch 'release/v16.4.16'

rowers/dataprep.py

@@ -1898,6 +1898,9 @@ def get_startdate_time_zone(r,row,startdatetime=None):
     startdate = startdatetime.strftime('%Y-%m-%d')
     starttime = startdatetime.strftime('%H:%M:%S')
 
+    if timezone_str == 'tzutc()':
+        timezone_str = 'UTC'
+
 
     return startdatetime,startdate,starttime,timezone_str,partofday
 

rowers/tests/testdata/.~lock.testdata_210616_075409.csv#

@@ -1 +0,0 @@
-,sander,sander-pc,16.06.2021 17:04,file:///home/sander/.config/libreoffice/4;