Merged revision(s) 1549-2433 from .git/trunk: