Update to new upstream release 0.20.6.