Improve cabal upgrade script
Change SDO update time
Merge branch 'master' into zaalbar