Reattempt version fix
Merge branch 'jonas'