Merge changes from FSF.