Admit defeat and just resize all the time
Merge branch 'beta3', remote-tracking branch 'origin/version4' into version4