Merge branch 'upgrades' into 'master'