Fix GitHub timezone reading - for real this time
Format and import optimisation