Merge staging tree to 1.0 trunk.