Merged /tags/beta14@38 /branches/release/beta15@43.