Merged revision(s) 28 from runk: