Merged revision(s) 1486-1547 from .git/trunk: