Merged /trunk:r2391-2403
Merged /trunk:r2317-2371.
Merged /trunk:r2404-2413
Remove superfluous stop_push()s.
Merged /trunk:r2634-2681.
Merged /trunk:r2414-2418
Merged /trunk:r2682-2735
Merged /trunk:r2741-2746