v2.3
37083a9e · Merged 2.3 from /trunk (r1781) into /branches/release. Post-release fixes or... ·