Merge SVN revision 84209 (by pal_Bazzi).