Merge branch 'master' into global_optimization

diff --cc basis/compiler/cfg/alias-analysis/alias-analysis.factor
Simple merge

diff --cc basis/compiler/cfg/iterator/iterator.factor
Simple merge

diff --cc basis/compiler/cfg/linear-scan/linear-scan-tests.factor
Simple merge

diff --cc basis/compiler/cfg/useless-blocks/useless-blocks.factor
Simple merge

diff --cc basis/cpu/x86/32/32.factor
Simple merge

diff --cc core/assocs/assocs-tests.factor
Simple merge

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