dont use sed -i

-i is not POSIX, use ed instead
Merge branch 'master' into next