Merge branch "preempt" in "trunk".