Europe/London is the de facto timezone here
Merge branch 'develop'