Importing the latest (r1798) changes uberlord made just before I've hit the commit button
Changed paths: