optional mandatory fix for time outside UK
Merge remote-tracking branch 'origin/master'