Merge branch 'hotfix/0.3.1'
Merge branch 'hotfix/0.3.1'
Hopefully fixed issues with time
Merge branch 'hotfix/0.3.2' into develop