Merge branch 'release/1.3.0' into develop
Fixed a bug that did not allow for rounds to be finished
Merge branch 'release/1.3.1'