Merge pull request #8418 from robx/bump-ubuntu