increment version
Merge branch 'master' into timezoneHandling