Merge branch 'setsockopt-extra-mem'