Updated to include latest commit

This will likely be the last commit for 6.22 alpha - once this has been stable for a week or so I'll tag it as a release.