Small changes over previous beta, arches please stabilise.
x86 stable
Stabilisation done in 947146579d95c78b26505f1a394ca6d672db2062