Merged /tags/beta13@28 /branches/release/beta14@36.