Merge recent important bugfixes.