Fixing the time shift (again, and again). Fully sober this time so chances are good that it will works correctly now ;)
Merge remote-tracking branch 'origin/master'