Merged revision(s) 1548 from .git/trunk: