Merge branch 'master' into stdenv-updates