Merge branch 'master' of git://factorcode.org/git/factor

diff --cc core/combinators/combinators.factor
Simple merge

diff --cc core/generic/standard/standard.factor
Simple merge

diff --cc core/inference/transforms/transforms.factor
Simple merge